prep combined demo
Merge branch 'hive'