adapt to internal changes