WIP updates to handling of inner roots