got rid of some crazy stuff
before filter
fix merge conflict