Added zone changing on the client and server