More struct

There is a significant improvement plz commit to master branch