some changes in punch handling