Actioning option 2 in #26 (part 2/2)