Try to cleanup the data munging
Hacking ES in
Fix