Addressing mateiz comment