started changing returns to tuples