merging sangram's changes