changed going to current function mapping to cf