Change switch method..