Update based on Ben's comments