added initial popup support