old switch case deleted