Changed where data is loaded in