Extra spacing and speed improvements