peeled out some more old logic