Improved link iteration
Improved link iteration