tier support, pedant run refactor