Reworking build