Added more checks, HW3 3.2