REV: sort out the collect module