moving things around so they work