performance improvements, pt. 2