Update demo.cpp for new tuple code