Upgraded to polymer 0.4