merged changes for checksum handling