more structure changes and new image