A few mods on hooks functions