updated to new data format, added fixed point handling