changes to join stuff