Unify for Square

Unify for Square