Florian Kerschbaum, University of Waterloo