Move hook aside so we can be smarter