improved loaders logic