fix transition with da, still needs heavy rewriting