Re-did answers with associations