More color changes
Added more filtering