reformatted pwd and updated to use uri instead of url