Make use of noneLink and optimise for loop