Added Typechecking and OK and NONE