partially updated to new Polymer version