Modified logic to accomodate users who ask to have show-warnings = true