Made all finaly changes before submission