Changes to RawData to increase checking capability of the code.