Merged Manas' changes