Update for new transition machine