Few changes to first submission