fix structure
fix structure 2