Develop

Structure optimization