Overhaul the colli-calculation with array functionality