Sandeep | some more changes