modify some codes