changed code, to include mailing urls as well.