@@ -28,7 +28,7 @@ REPOSITORY = gcr.io/agones-images
 # Directory that this Makefile is in.
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 project_path := $(dir $(mkfile_path))
-server_tag = $(REPOSITORY)/cpp-simple-server:0.9
+server_tag = $(REPOSITORY)/cpp-simple-server:0.10
 root_path = $(realpath $(project_path)/../..)
 
 #   _____                    _
 
@@ -34,7 +34,7 @@ void DoHealth(std::shared_ptr<agones::SDK> sdk) {
 // watch GameServer Updates
 void WatchUpdates(std::shared_ptr<agones::SDK> sdk) {
   std::cout << "Starting to watch GameServer updates...\n" << std::flush;
-  sdk->WatchGameServer([](agones::dev::sdk::GameServer gameserver) {
+  sdk->WatchGameServer([](const agones::dev::sdk::GameServer& gameserver) {
     std::cout << "GameServer Update:\n"                                 //
               << "\tname: " << gameserver.object_meta().name() << "\n"  //
               << "\tstate: " << gameserver.status().state() << "\n"
 
@@ -68,7 +68,7 @@ class SDK {
   // This is a blocking function, and as such you will likely want to run it
   // inside a thread.
   AGONES_EXPORT grpc::Status WatchGameServer(
-      const std::function<void(agones::dev::sdk::GameServer)>& callback);
+      const std::function<void(const agones::dev::sdk::GameServer&)>& callback);
 
  private:
   struct SDKImpl;
 
@@ -99,7 +99,7 @@ grpc::Status SDK::GameServer(agones::dev::sdk::GameServer* response) {
 }
 
 grpc::Status SDK::WatchGameServer(
-    const std::function<void(agones::dev::sdk::GameServer)>& callback) {
+    const std::function<void(const agones::dev::sdk::GameServer&)>& callback) {
   grpc::ClientContext context;
   agones::dev::sdk::Empty request;
   agones::dev::sdk::GameServer gameServer;
 
@@ -119,7 +119,6 @@ passing in a `stable::agones::dev::sdk::GameServer*` to push the results of the
 This function will return a grpc::Status object, from which we can call `status.ok()` to determine
 if the function completed successfully.
 
-{{% feature expiryVersion="0.12.0" %}}
 ```cpp
 stable::agones::dev::sdk::GameServer gameserver;
 grpc::Status status = sdk->GameServer(&gameserver);
@@ -140,31 +139,32 @@ sdk->WatchGameServer([](stable::agones::dev::sdk::GameServer gameserver){
 });
 ```
 {{% /feature %}}
-{{% feature publishversion="0.12.0" %}}
+{{% feature publishVersion="0.12.0" %}}
 To get the details on the [backing `GameServer`]({{< relref "_index.md#gameserver" >}}) call `sdk->GameServer(&gameserver)`,
 passing in a `agones::dev::sdk::GameServer*` to push the results of the `GameServer` configuration into.
 
 This function will return a grpc::Status object, from which we can call `status.ok()` to determine
 if the function completed successfully.
 
-{{% feature expiryVersion="0.12.0" %}}
 ```cpp
 agones::dev::sdk::GameServer gameserver;
 grpc::Status status = sdk->GameServer(&gameserver);
 if (!status.ok()) {...}
 ```
 
 To get [updates on the backing `GameServer`]({{< relref "_index.md#watchgameserver-function-gameserver" >}}) as they happen, 
-call `sdk->WatchGameServer([](agones::dev::sdk::GameServer gameserver){...})`.
+call `sdk->WatchGameServer([](const agones::dev::sdk::GameServer& gameserver){...})`.
 
 This will call the passed in `std::function`
 synchronously (this is a blocking function, so you may want to run it in its own thread) whenever the backing `GameServer`
 is updated.
 
 ```cpp
-sdk->WatchGameServer([](agones::dev::sdk::GameServer gameserver){
-    std::cout << "GameServer Update, name: " << gameserver.object_meta().name() << std::endl;
-    std::cout << "GameServer Update, state: " << gameserver.status().state() << std::endl;
+sdk->WatchGameServer([](const agones::dev::sdk::GameServer& gameserver){
+  std::cout << "GameServer Update:\n"                                 //
+            << "\tname: " << gameserver.object_meta().name() << "\n"  //
+            << "\tstate: " << gameserver.status().state() << "\n"
+            << std::flush;
 });
 ```
 {{% /feature %}}
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ grpc::Status SDK::GameServer(agones::dev::sdk::GameServer* response) {`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`grpc::Status SDK::WatchGameServer(`
`102`		`- const std::function<void(agones::dev::sdk::GameServer)>& callback) {`
	`102`	`+ const std::function<void(const agones::dev::sdk::GameServer&)>& callback) {`
`103`	`103`	`grpc::ClientContext context;`
`104`	`104`	`agones::dev::sdk::Empty request;`
`105`	`105`	`agones::dev::sdk::GameServer gameServer;`