updated based on latest developments and feedback
update to use URI