Changes for catch as matrix