change function name and small fix