Tpa and tpahere now use one function handler