Updated gathering functions