Continue switching to new function