Added few but important changes in