Transition update (still not 100%)