Added swithces