added polymer components in the worst way