Diff for A/9c4ee977eafe7414b554ee08c35a63c2 (Commits: e01eb8, e01eb8, Removing prior association method. )