Association updates

1 2 7