Work in progress for transition output fix