Make speed improvements