More work for hierarchical EXCEPT FOV is still broken so it is not complete yet