fixed the join system to be easier

the old systems was too complicated