Further improves atom comparison