change to have clean build system