Commit #2 for this branch.