further tweaking uri's