properly builds the correct/limited data set now