Minor changes
Merge manish's code