Join problem changes