MOE-04: way-base upgrade