AUC-3101 refactored