Assignmet 4 modified