Changed pkg demo to use Filter and Grating (still needs work)