All of HW5 added