More planning - less noise

Noise management and planning