Start of the changes requested by Will in email