moved data to the bottom of results and updated plan executor