Switched to using INNER JOINs