Pmitros/changing behavior on timeout