still fixing urls2