No need to pass the function addr around anymore