Changes so Joins are possible