more changes to speed up total build completion time