Another round of work on the hooks