move a couple of things around for better synergy