refactor address and more