more internal changes