some changes in the structure and resource