Working

Still need to faster the dataLoader