#3 updating files for supporting demo