Update demo and build