Performance & Improvements

Changes