Changes by Soumya

All my changes. We will discuss it again in FSCONS