Add assoc update in

Let me know if you disagree with anything here.