Improved the Generate... Attribute
Renamed the Filters. Still not happy.