Further rework of build