refs #2723 - refactored hook