Added a setting flag to switch off required