Original build machine needs facelift