Using new hooks, no need to add custom hooks