Massive hook performance improvement