Commit 17: Finalized