Final Commit V.2