done with data munging
fixed version