The rest of the changes