Association updates

1 8 9