PBIL (wip)
small refactor