Better atom-shell detection.