ENH: Faster shaping