Some additional hooks (thanks SM and Viper)