Reworked pitch handler.