merged Anirudha's & Sasha's changes