added Address 1 and Address 2 inputs