adding 2nd join and tweaking the spinning check