add structure and correct show