Edits with suggestions from Minna.