added new areas plus Switch list