Few changes of my own