New configuration. Simplify options to two.

Work in progress