performance improvements for educate