Changes from @aledsage review comments