Change to andrew's uri scheme