more logical version of previous change