Hassan Khan, University of Waterloo