Updated for the new EE machine & some fixs