Added demo functionality