refactored resources