For now, use the client code