Addition of Cotrol Way test and option