Improve the keeper punch system