Changed to atom-shell and polymer