new version based on polymer only