Few changes based on Sayak's email