Version 1.5 of the assignment