Added redirect url with less complexity