AM-172 - refactored