Reworked step 8 (filter)