add structure and partial see setup