Hello
Sorry for not being more detailed
Going there I am flying
Pearson (Toronto) > Baiyun (Guangzhou - 2hr layover) > Pudong (Shanghai) > Haneda (Japan)
Going back I am flying
Haneda (Japan) > Pudong (Shanghai) > Baiyun (Guangzhou - 13hr layover) > Pearson (Toronto)
Also not sure if this matters but my flight to Shanghai and flight to Japan are with different airlines
Toronto to Shanghai is China Southern
and Shanghai to Japan is Peach Airlines