further improve the build