updated for latest Polymer