New version with popup