Changes to PWM mechanics