Improved the hook system