Updated for HW4 section 2