todo corrections in integration