performance improvements
performance improvements + additions