fix(hooks): improving hooks
fix(hooks): improving hooks