changing address for self and derivative cases

Top