Updated link list
Optimized code