Updates from demo