More optimizations - saves another 25% of time... :)