I retconned the last bit of M-0018 to canon.