small refactoring and new build.