(i landed some changes to the build system yesterday)