Modified make_bonds2 to use non-carbon atoms.