Attempting further performance and cpu improvements.