Initial conversion to use polymer