Few changes at the end