some more munging