move things around some more...