Changed to switch do