DS generation improved