Merged Aman's code

I merged Aman's code with mine