update before submission!!