added code which replaces address field values.