few internal changes