rearranged model associations