HW3-3 Initial changes