- Function calls now working with new stub scheme