Fix bug and change Values to use switch statement