Update cycle-coll with code from AlexBaranosky