revised some files base on Paul's comment