Polishing calcPitch even more...