Apply the changes requested by Matthew Turland