FINAL update

Changes to make Inv work