Speed up build take 2