merged back in lost supplycomp sanity