even more baseurl changes