Changed return tuple