Update to GoSquared completly