Some more hook work