some updated data routing