Update to ordering & messages demo