小的修改以确保符合中文语法及习惯
first part of upgrading almost translated