Final Commit 1-2