Replaced the old demo.py with the new merged demo.py