Update based on feedback from Lee