Better transition handling