new collection policy again, much better now