improved transitioning