Re-order the hooks a bit