some changes. sorry for resource deletion, will add back!