After part3 from HW3