Updating changes

Check out all the changes