final changes based on Ben's feedback