Merged Koki's changes with Sam and Naveens changes