Added extra switch