May 3rd Partial changes from Keegan