Implemented swapping of two address views