more hooks closes #3860