Added link logic but not yet tested