John-Logan-edited