Merged Amit's changes
some changes