Added both joins