Minor adjustments due to feedback from AS.