ver2.0 revise