Merged Abhi's stuff