Hook handling refined