Made a few customizations to satisfy HW4_2