Commit 18: Finalized