add join properly