Improve submission for assignment 3.