some changes and domain