new version with rich popups