changed the uris to use links, need more cleaning