minor modify!!!!