speed improvements for 23