incorporated feedback from Norman