Trying to change datafetching, have'nt tested yet but should work