more changes from Rory