Peformance Improvements