Closer to working build machine