Updated with the new hooks.