Modify some changes