Added build working ness