Refactor the way autocall is wired in