FIXED SOME PERFORMANCE ISSUES