Updating some of the logic on client and server.