refactor function names for fifth