Updated based on Patrick's feedback.