Moving things around to get a better setup