Don't need the special context any more
Do it via transformation context