Update based on conversation with Ed