modify method name and function name