removed more 5.004 ambiguities including making the format of data