The last commit, cont'd