Update to include out demo implementation