Modify some codes