Changes resulting from Ryan's feedback.