Add option, logic in separate diff.