changed uri
update - still needs a lot of cleaning