Changed switch code to include unique tokens