Integrating remaining changes

Pradyumna & Shruti's together