Jon's Changes and mine merged