Added yet more changes to the assignment