changed links, more testing