HW5 2: Features updated