Pre-public changes

Pre-public changes