Merging code by Amol