Speed improvements to the system