Move the hook earlier?