Added ji's changes to urls