Enhanced fitering
hw 2 part 3 complete