New style end of build