Revised for join organization.