geoff, change 1 & 5