foofoo
jmol functional
merging conflicts