finished moving links - to be tested