Changed inv_rm signature
Merged with prior commit