Changes following Ben's comments