refractoring & breadcrumbs for all