Association updates

1 13 14