Performance enhancements part 2