Improved (using last version of Atoms)