Updated to new Square