Better quoting without hooking updating all the time