Change from query to fourtuples for now