restructure to make dispatch data clearer with instructions