Update based on conversation with Phil Sturgeon