Reworked pitch-handler.