Changed how it forwards urls