#8: Improved Performance