LPS-35674 I think this is more obvious what relies on what