change function name according to review