rename fucntion
 try to fixbug