Some performance improvements
Not beta anymore