Added join_hook