More new effects, several optimizations