revise files for v2.1