modified to use polymer 0.5.1