Improved performance more, from 33 seconds to 24seconds