new build, corrected more