making logic uhm...more logical
more minor magic making