Adapted to new inventory system