Join clause reworked.