Re-add PB timer

closes #22