Update Demo and Bug fix