adding logic to support additional set-feature functionality