Last Commit, with little finalisation things