Edited for Hw6