more logical changes