Commit #3.1