expanded munging and added logit