REFACTOR/build-process