added two join and field