Improved generality of pb11 and added test