Refactored data source (single tapping busted tho)