Merged Ritesh's changes