New function injection approach working! :-)