fixed filter. should be complete. need to test