updated pbnt, conditional working