Association updates

1 2