change Qi's affiliation to waterloo as well