Fiddling with speed improvements