Updated Atoms to be modern