MOE-02: way-base upgrade