more demo improvement