Harry: a few changes