Updates in response to Stef's comments.