HW 07 modified