Better transition to following state