full DI completed for now