-Change: re-worked parts of the inv sub-app