First commit after reviewers' comments.