updated to use core and paper elements