Improving the hooks a bit