Updating code with Arun's changes<sreeks>