started splitting the fetch results & update states logic