Second submission of the assignment