Improved Performance and Code