loader refactor  +loading tasks