Updated Address checking