Add win handler and tie handler