reverting dataloading and some unkown changes