Another 40% performance improvement