Noise & h2 redesign