modified for live url change