This commit is for HW 9/12/13