Fixed changes from ass1 review