22534 list refactor