Added in loops and added in links