Now correctly supporting transitions.