new build with minor fixes