Added Return URL functionality