Accidentally forgot to commit the rest of the changes