MOE_04: way-base upgrade