Pitch works as it should. Re-factor done