Updates from development demo