Got rid of buggy nondeterministic resolver
Removed cls write in new - causing infinite recursion