updated to use polymer container