adapt to change to typechecker