moving things around to make more sense