More work on hierarchy