Make transitions smoother