This actually does the changes in the last commit