refactored collections