change in optionality handling resulted in stricter controls

3 files changed