Adjusted collection algorithm

@ndushay