Final Commit

Optimized Performance