align with RootBox Changes