Rebuid with new Checks