Continued Working on Demo