Adding demo feature