Apply the changes

Here is some changes I made :3