Change struct of back
Merge origin/master