Switch to new function