fix and new build
merge