Added dual mode system