Smart now prefers edge atoms
Merge branch 'master' into experiment