Feature/re instate data content raw