Applying pre-production modifications

Applying pre-production modifications