more changes to join form