improving build stability and effeciency