Optimizations, decent speed boost from this update.