Solved size stuff
Merge conflicts