Adding tentative onExit solution