Merged Ahsan's code