Performance enhancements. 100 times faster