Address Ben's feedback