moving things to make more sense