Update based on Luke's comment on the code review