added extra join thingo