Change build process accordingly...