* Updated last parts of code for dual association system