Association updates

1 4 5