Square integration
Merge conflits