Updates based on Patrick's comments.