Updated to polymer