Added more hooks, hookall broken completly now