some minor modify