Yinglei modifed some classes