Adapted for atom-shell