Changed internal design, removed checks that will never differ in their result