Macro Graal Era Repack (COMPLETE — FIX)