Performance Improvements

Forgot changes to main body