refactored old resources to new ones