First public version after code review.