re #1 realy add baseurl