Make this compile towards new function call design