Update demo.

Move lastest changes to dev