Added Manas' changes again
merges
merges