Removed space-to-speed-up until we figure out an alternative