enhancement some function
enhancement some function