change return values to tuples