merged mani's changes

changes done