|#009|Roy,Megha| refactored code and fixed bugs