Changed return values