Smoother transition

bench: 7357005
Smooter transition: take 2

bench: 7537300