moved map and address into above