Reimplemented the bond handling as a list and not as an array