CHG - Added selection popup