added hook filter and tweaks