Performance Improvements

(hopefully)