Typechecker updated