Commit 3

Abhi’s changes from 27 Aug.