removed some forethought and simplified associations