Move to new integrity check