new resources and refactoring