changes corresponding to mandatory comments - changes still incomplete
Merge remote-tracking branch 'origin/amit' into amit