Update build and demo