modify some
add some