move crc wrapper to slightly better spot