more updates for 3 RC2