Finished the changes (or so it seem)