Changed the way we list our own addresses