New better build process