rewrite for the demo (master)