more IRREG refactor