moving things around a bit