Association updates

1 11 12