BAZYNGO-900 Change to list