Got the join to work correcly