add new func
fixed problem
fixed problem
fixed bug