added functional atoms in to the mix