Commit 6.4