adding in Filters
changed code for generic wave generator