adding initial address check