+ modifications in order to use new data format / access methods