some shifting around of things