Split demo into two