Working on a Toji suggestion.