now supporting unified popup handling