added support for new popup