antoniop
committed
on 08 Oct
Rework so that an array is not needed