Merged Hari's 4th and my previous commit