added more structure to output