Added filter to outputs
Got output filtering working