Merged Binaya's changes