Final 3/12 changes for Iteration-1