adjusted flow due to url change