Final draft of hooks - ready for final corrections