rename function
remove debug