FIXED the associations between models