refactored associations
refactored associations