Association updates

1 5 6 7