Assignment 4.1 fixed