Update based on feedback from Ben