Added a demo feature [temp]