Switched back to old calling style for more user control