Use the new simplified signal stuff for demos