fixed the associaitons