Upgraded the hooking systems