Few changes to a some lines