More work on hierarchy demo