Improving the build. EOM