DataLoader modified ans some adjustements.