Improved hole punching a bit.