The last commit, done properly