Added hooks back