Fixed storage and loads actual data now