Ok, I'm done with the changes