reflecting some internal changes