Proposed Final Commit