Got rid of internal data format /vrutberg