Added very square ball
Merged conflict