Removed old crc16, added new one