Better transition management