Updated with enaR_checks additions