Rework the checks