changed to work on more than one address