add join with test
merge code be carefull...