Leaving the join alone for now...