change a little: re order the demo feature