Latest update for Final Submission