Few changes here and there