Addressing feedback from Arthur