rearranged relations, they are much better now