fixes to speed up changes