Updated based on Jason's feedback.