Merged Usman's changes