Move to a join to hopefully increase performance