Updated to use the most recent and best atom.dat