adapt to more delite changes