#5 finished conditions in adding address