Further efficiency and speed improvements