WIP add PB handler