changes
missc changes
conflicts resolved
constants changed for public copy