More INV collapse work