Third submission of the assignment