changed asociations back to one table with attributes