adjusted versions to reflect current options