reworking build system