performance Improvements