adjusted to polymer best practise