changed naming from query to data