added switchs