refactored to represent resources more accurately