1. Refactored Collect in preparation for fixed the collect failures