Performance enhancements part 1